From: Tassilo Horn <tassilo@member.fsf.org>
Date: Mon, 28 Dec 2009 19:25:38 +0000 (+0100)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8837^2~1
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5be58863c710bb28b867db4b4f0df442b5fc2a43;p=emacs.git

Merge from mainline.
---

5be58863c710bb28b867db4b4f0df442b5fc2a43